From db94bdb3145c48356d17637a33c4298613215c21 Mon Sep 17 00:00:00 2001 From: Rob Hoes Date: Tue, 10 Dec 2013 16:48:33 +0000 Subject: [PATCH] libxl: ocaml: add some missing CAML macros Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/xenlight_stubs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index c1a9229bb1..a61c22263b 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -59,6 +59,7 @@ static value Val_error (libxl_error error_c); static void failwith_xl(int error, char *fname) { + CAMLparam0(); CAMLlocal1(arg); static value *exc = NULL; @@ -75,6 +76,7 @@ static void failwith_xl(int error, char *fname) Store_field(arg, 1, caml_copy_string(fname)); caml_raise_with_arg(*exc, arg); + CAMLreturn0; } CAMLprim value stub_raise_exception(value unit) @@ -338,7 +340,7 @@ static libxl_defbool Defbool_val(value v) bool b = Bool_val(Some_val(v)); libxl_defbool_set(&db, b); } - return db; + CAMLreturnT(libxl_defbool, db); } static value Val_hwcap(libxl_hwcap *c_val) @@ -369,10 +371,11 @@ static value Val_string_option(const char *c_val) static char *String_option_val(value v) { + CAMLparam1(v); char *s = NULL; if (v != Val_none) s = dup_String_val(Some_val(v)); - return s; + CAMLreturnT(char *, s); } #include "_libxl_types.inc" -- 2.30.2